<<<<<<< .mine
<?php
include('includes/config.php');

$filters = getMsgFilters();
$totalTable = showAllMessages($filters, $link);


$pageTitle = 'Всички съобщения';
include 'includes/header.php';
?>                   
<div class="menu">
      <a href="msglist.php" class="current">Списък с всички съобщения</a>
      <a href="addmessage.php">Ново съобщение</a> 
      <a href="javascript:void(0)" id="showHideFilter">Покажи филтрите</a> 
      <a href="index.php?do=login">Изход</a> 
      <span class="welcome tar floatRight"><?php echo welcomeMessage(); ?></span>
</div>
<?php
include 'includes/messages.php';
?>
<div id="container">
      <?php
      echo $totalTable;
      /*
       * 
      $filterSelect . '
    <div class="leftPart">' . $totalTable . '</div>
    <div class="rightPart">
      ' . $tableByGroups . '
      ' . $showBiggestSize . '
    </div>
    ';
       */
      include 'includes/footer.php';=======
<?php
include('includes/config.php');

$filters = getMsgFilters();
$totalTable = showAllMessages($filters, $link);


$pageTitle = 'Всички съобщения';
include 'includes/header.php';
?>                   
<div class="menu">
      <a href="msglist.php" class="current">Списък с всички съобщения</a>
      <a href="addmessage.php">Ново съобщение</a> 
      <a href="javascript:void(0)" id="showHideFilter">Покажи филтрите</a> 
      <a href="index.php?do=login">Изход</a> 
      <span class="welcome tar floatRight"><?php echo welcomeMessage(); ?></span>
</div>
<?php
include 'includes/messages.php';
?>
<div id="container">
      <?php
      echo $totalTable;
      /*
       * 
      $filterSelect . '
    <div class="leftPart">' . $totalTable . '</div>
    <div class="rightPart">
      ' . $tableByGroups . '
      ' . $showBiggestSize . '
    </div>
    ';
       */
      include 'includes/footer.php';>>>>>>> .r2
